From 6ce59f047e41aaf3e481ffad518ffb787402f00c Mon Sep 17 00:00:00 2001 From: "iap10@freefall.cl.cam.ac.uk" Date: Wed, 6 Jul 2005 22:54:29 +0000 Subject: [PATCH] Enable CONFIG_SMP, CONFIG_SMP_HOTPLUG and CONFIG_SMP_ALTERNATIVES in the -xenU default kernel. Signed-off-by: ian@xensource.com --- .../arch/xen/configs/xenU_defconfig_x86_32 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 index 7813f5ec35..c2011b63b2 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.11.12-xenU -# Wed Jul 6 17:44:54 2005 +# Wed Jul 6 22:40:19 2005 # CONFIG_XEN=y CONFIG_ARCH_XEN=y @@ -28,7 +28,6 @@ CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y # CONFIG_EXPERIMENTAL=y CONFIG_CLEAN_COMPILE=y -CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y # @@ -69,6 +68,7 @@ CONFIG_OBSOLETE_MODPARM=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y +CONFIG_STOP_MACHINE=y # # X86 Processor Configuration @@ -114,7 +114,10 @@ CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y # CONFIG_HPET_TIMER is not set # CONFIG_HPET_EMULATE_RTC is not set -# CONFIG_SMP is not set +CONFIG_SMP=y +CONFIG_SMP_ALTERNATIVES=y +CONFIG_NR_CPUS=8 +# CONFIG_SCHED_SMT is not set CONFIG_PREEMPT=y CONFIG_PREEMPT_BKL=y CONFIG_X86_CPUID=y @@ -128,6 +131,7 @@ CONFIG_HIGHMEM4G=y CONFIG_HIGHMEM=y CONFIG_HAVE_DEC_LOCK=y # CONFIG_REGPARM is not set +CONFIG_HOTPLUG_CPU=y # # Kernel hacking @@ -153,7 +157,9 @@ CONFIG_EARLY_PRINTK=y # CONFIG_4KSTACKS is not set CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_X86_SMP=y CONFIG_X86_BIOS_REBOOT=y +CONFIG_X86_TRAMPOLINE=y CONFIG_PC=y # -- 2.30.2